Minor leak fixes.

diff --git a/gpsbabel/csv_util.h b/gpsbabel/csv_util.h
index a0bd4c09b6ec96fffd24be952fbae1229a903841..872173d793830d409bba74cd0ebe6a8a07912ab5 100644 (file)
--- a/gpsbabel/csv_util.h
+++ b/gpsbabel/csv_util.h
@@ -24,7 +24,7 @@ char *
 csv_stringtrim(const char *string, const char *enclosure, int strip_max);
 #else
 CSV_STRINGTRIM(const char *string, const char *enclosure, int strip_max, DEBUG_PARAMS);
-#define csv_stringtrim( s, e ) CSV_STRINGTRIM( s, e, __FILE__, __LINE__);
+#define csv_stringtrim( s, e,m ) CSV_STRINGTRIM( s, e, m, __FILE__, __LINE__);
 #endif
 
 char *

diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index c3ff29c4c77e4b2e1f66664ce4f45909b14d6cf0..8e23c543400aad7b29c35f5f12c94efdaa0d752b 100644 (file)
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -145,6 +145,7 @@ geo_end(void *data, const char *el)
                in_name--;
        }
        else if (strcmp(el, "type") == 0) {
+               wpt_tmp->icon_descr_is_dynamic = 1;
                wpt_tmp->icon_descr = xstrdup(typestr);
                memset(typestr,0, MY_CBUF);
                in_type--;

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index cde422c1bff2bbb4cff0b0175a7c57f7cfc85184..639ab306438623267387746cdf917e6dbf00ae7b 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -536,6 +536,7 @@ void mapsend_track_hdr(const route_head * trk)
        
        fwrite(&c, 1, 1, mapsend_file_out);
        fwrite(tname, c, 1, mapsend_file_out);
+       xfree(tname);
        
        /* total nodes (waypoints) this track */
        i = 0;